(ftfont_get_open_type_spec): Check spec->script, not val.

diff --git a/src/ChangeLog b/src/ChangeLog
index 663d61bc91a4a206da1ad7c03dfc029304e06eff..9d326e29880d7cdee6babf99cc86e9c40789a7f2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-03  Jason Rumney  <jasonr@gnu.org>
+
+       * ftfont.c (ftfont_get_open_type_spec): Check spec->script, not val.
+
 2008-04-02  Chong Yidong  <cyd@stupidchicken.com>
 
        * callint.c (Vshift_select_mode): New var.

diff --git a/src/ftfont.c b/src/ftfont.c
index aac267b209558b1a5aa5090c21cadf6487348891..a3ce243f369b2b04452a8341458ae2ad662b23d7 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -355,7 +355,7 @@ ftfont_get_open_type_spec (Lisp_Object otf_spec)
   if (! spec)
     return NULL;
   spec->script = XCAR (otf_spec);
-  if (! NILP (val))
+  if (! NILP (spec->script))
     {
       OTF_SYM_TAG (spec->script, spec->script_tag);
       val = assq_no_quit (spec->script, Votf_script_alist);